bitkeeper revision 1.304 (3f0ad511ewd4vWen663xQYwlMYc8Tw)

Merge labyrinth.cl.cam.ac.uk:/auto/groups/xeno/BK/xeno.bk
into labyrinth.cl.cam.ac.uk:/auto/groups/xeno/users/rac61/xeno.bk

diff --cc .rootkeys
Simple merge

diff --cc xenolinux-2.4.21-sparse/arch/xeno/drivers/dom0/dom0_core.c
index 0e1a98160579ade95106ff54424174b212d95a04,3377c3b3a6672bd9aad6d200047138172094c2e9..69577000e0c55eef0b38df75d5389157d88d999b
--- 1/xenolinux-2.4.21-sparse/arch/xeno/drivers/dom0/dom0_core.c
--- 2/xenolinux-2.4.21-sparse/arch/xeno/drivers/dom0/dom0_core.c
+++ b/xenolinux-2.4.21-sparse/arch/xeno/drivers/dom0/dom0_core.c
@@@ -53,8 -52,19 +53,7 @@@ static struct proc_dir_entry *dom_list_
  
  unsigned long direct_mmap(unsigned long, unsigned long, pgprot_t, int, int);
  int direct_unmap(unsigned long, unsigned long);
- int direct_disc_unmap(unsigned long, unsigned long, int);
  
 -static unsigned char readbuf[1204];
 -
 -static int cmd_read_proc(char *page, char **start, off_t off,
 -                         int count, int *eof, void *data)
 -{
 -    strcpy(page, readbuf);
 -    *readbuf = '\0';
 -    *eof = 1;
 -    *start = page;
 -    return strlen(page);
 -}
 -
  static ssize_t dom_usage_read(struct file * file, char * buff, size_t size, loff_t * off)
  {
      char str[256];
@@@ -157,12 -158,10 +156,12 @@@ static ssize_t dom_mem_write(struct fil
  {
      dom_mem_t mem_data;
      
 +    printk("dom_mem_write called: Shouldn't happen.\n");
 +
      copy_from_user(&mem_data, (dom_mem_t *)buff, sizeof(dom_mem_t));
      
-     if(direct_disc_unmap(mem_data.vaddr, mem_data.start_pfn, 
-                          mem_data.tot_pages) == 0){
+     if ( direct_unmap(mem_data.vaddr, 
+                       mem_data.tot_pages << PAGE_SHIFT) == 0 ) {
          return sizeof(sizeof(dom_mem_t));
      } else {
          return -1;

diff --cc xenolinux-2.4.21-sparse/arch/xeno/drivers/dom0/dom0_memory.c
index 282ada24dfd54d51859973f0f7bbfc97edf99160,8b1ffcd5f35b3bfa5bdb464b5764dd425d772684..46004d397184e9c08bef407d71ab87153d4dd074
--- 1/xenolinux-2.4.21-sparse/arch/xeno/drivers/dom0/dom0_memory.c
--- 2/xenolinux-2.4.21-sparse/arch/xeno/drivers/dom0/dom0_memory.c
+++ b/xenolinux-2.4.21-sparse/arch/xeno/drivers/dom0/dom0_memory.c
@@@ -124,10 -124,10 +124,10 @@@ int direct_remap_page_range(unsigned lo
   * found from frame table beginning at the given first_pg index
   */ 
  int direct_remap_disc_page_range(unsigned long from, 
-                 unsigned long first_pg, int tot_pages, pgprot_t prot)
+                                  unsigned long first_pg, int tot_pages, pgprot_t prot)
  {
      dom0_op_t dom0_op;
 -    unsigned long *pfns = get_free_page(GFP_KERNEL);
 +    unsigned long *pfns = (unsigned long *)get_free_page(GFP_KERNEL);
      unsigned long start = from;
      int pages, i;
  
@@@ -153,8 -153,8 +153,8 @@@
          }
      }
  
- out:
+  out:
 -    free_page(pfns);
 +    free_page((unsigned long)pfns);
      return tot_pages;
  } 
             

diff --cc xenolinux-2.4.21-sparse/arch/xeno/kernel/process.c
Simple merge